Xenlinux/ia64 can't use xenlinux/x86 version of drivers/acpi/tables.c

Also more unique naming for directories that are moved aside

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
index 8dd4a0c0496dd899c1369d051d93d58aeaf98cf2..3b772d49872ac28bc0bb566c66cca5bc616378d2 100755 (executable)
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
@@ -1,14 +1,15 @@
 #!/bin/bash
 if [ -e mm ]
 then
-       mv mm mm.x86
-       mv net net.x86
-       mv kernel kernel.x86
+       mv mm mm.xen-x86
+       mv net net.xen-x86
+       mv kernel kernel.xen-x86
+       mv drivers/acpi/tables.c drivers/acpi/tables.c.xen-x86
        mv arch/xen/kernel drivers/xen/core
-       mv arch/xen arch/xen.x86
+       mv arch/xen arch/xen.xen-x86
        mkdir arch/xen
-       mv arch/xen.x86/configs arch/xen
-       mv include/asm-generic include/asm-generic.x86
-       mv include/linux include/linux.x86
+       mv arch/xen.xen-x86/configs arch/xen
+       mv include/asm-generic include/asm-generic.xen-x86
+       mv include/linux include/linux.xen-x86
 fi
 cp ../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/